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