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