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