Merge "[automerger skipped] Merge "Update PMService tests to use SDK version...

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 skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 f5344f6c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23021530



Change-Id: I817b001a0ed1deab9eb23df5cc1e0e84ea7b1fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>