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