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