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