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