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