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