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