[automerger skipped] Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev am: 47727334a1 -s ours

am skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 714d1f1b34 is already in history

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

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