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