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