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