[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: af4f00640d -s ours am: f9a9c01f7a -s ours

am skip reason: Change-Id I01370006b53b5a52c4d0072fcbc3c41cdc4858b2 with SHA-1 f0afa4c5d8 is in history

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

Change-Id: I4623cc72427764efccfbf8a673684765e06b77d8