Merge mainline-release 6664920 to master - DO NOT MERGE am: 11fdc44c1e

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

Change-Id: Ic33a72590b4a33f2b5fc3d9a15ae9dbd898bc9e7