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