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