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