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