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