Merge changes from topic "presubmit-am-26958096690c482abea4354283b65f19" into sc-qpr1-dev am: 7b8347b70f

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

Change-Id: Iaba200c618bf979935c9271ed3fb63a62c66c07c