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