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