[automerger skipped] Merge Android 12 am: 4674ba9c4f -s ours am: a87cc8883f -s ours am: 7ae4518f87 -s ours

am skip reason: Merged-In Idab7f31e09a61a61ef343855801e3bd7de7efd29 with SHA-1 18352d35e1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/BuiltInPrintService/+/1847893

Change-Id: I9a8022bee1c7ac1bfec15604ada49c177e65fb97