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