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