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