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