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