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