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