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