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