[automerger skipped] Merge "Fix testUsesSdk test to use higher extension...

[automerger skipped] Merge "Fix testUsesSdk test to use higher extension version." into tm-qpr-dev am: 06367a1f -s ours

am skip reason: Merged-In I5fb3ceed2b6db3dd5a5154df941918b97cb52204 with SHA-1 58749248 is already in history

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



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