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