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