Merge "Adjust APIs for CUPS 2.3.3" am: 49783c61bc am: aa18ecd9af

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47ef91d9d55cf89777dee5020f8aa310dced8557