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