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