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