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