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