[automerger skipped] Merge sc-qpr1 to aosp-master - DO NOT MERGE am: fc4dcbd61b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7150dabe5a4d343ca802ff0322b27be08b5a6b48