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