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