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