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