[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 52242532b9 -s ours am: 2c21cc0372 -s ours

am skip reason: Change-Id Id92ad25478ab677e18fb87d28f26eab58aa9e1f4 with SHA-1 19b0021ee7 is in history

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

Change-Id: Id7a2ce70b120a34452c011e815259c021e887130