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