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