Merge changes from topic "am-df1f2580da7f4f04956810936dd8d3c0" into udc-qpr-dev-plus-aosp

* changes:
  Merge "[automerger skipped] Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev am: 47727334 -s ours am: 1a6345a5 -s ours" into udc-dev-plus-aosp am: 073dc630 -s ours am: 7d9aec15 -s ours
  [automerger skipped] Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev am: 47727334 -s ours am: 1a6345a5 -s ours am: 4f9a2344 -s ours am: 82598a26 -s ours