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