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