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