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