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