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