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