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