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