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