Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656 Change-Id: Icfb04efc047f26c51465336dd62c9e1cda49b62e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>