[automerger skipped] Merge redfin/bramble support. am: 2af05baa77 -s ours am: 26fd93deaa -s ours am: 73672fe249 -s ours

am skip reason: Change-Id I921547b6666d3287330847cecc60fa08f09e4306 with SHA-1 27ce4df9e5 is in history

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

Change-Id: Iac47a853ad5e7d4ea64a7f1445b71a158152ef38