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