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