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