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