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