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