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