[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: d4a47a6549 -s ours am: 471640f421 -s ours

am skip reason: Merged-In Ia5ff62e79443b233dfcc6d2d5e405b25cde73503 with SHA-1 31d6bdd15b is already in history

Original change: https://android-review.googlesource.com/c/device/google/barbet-kernel/+/2059230

Change-Id: I88c03c25b38026ea2001d15105858e194038a36f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>