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