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