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