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