am 6bc20a54: am 533e118f: Merge "Addressing API councing suggestions for...
am 6bc20a54: am 533e118f: Merge "Addressing API councing suggestions for com.android.printservice" into klp-dev
* commit '6bc20a54':
Addressing API councing suggestions for com.android.printservice