[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 11fdc44c1e am: c06b8cfedd -s ours am: ae9fa4dec7 -s ours

am skip reason: Change-Id I439dcaaa34979adff8ca260774e9b72833b5f291 with SHA-1 f9a9c01f7a is in history

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

Change-Id: Ia2db12125651e0985c9885f654cf9c690feeff99