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