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