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