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