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