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