[automerger skipped] Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev am: 47727334a1 -s ours am: 1a6345a5c8 -s ours
am skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 f5344f6c4e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23021530
Change-Id: I10a22b9b6d9662436076ba45339caa72ad6cd868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: