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