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