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