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