[automerger skipped] Merge Android R am: 8e91010af9 -s ours am: 71e27657e9 -s ours

am skip reason: Change-Id I304c9380ef53b720858f4b094addf677f06c8e99 with SHA-1 5e8c28d05e is in history

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

Change-Id: I01370006b53b5a52c4d0072fcbc3c41cdc4858b2