[automerger skipped] Merge "Fix testUsesSdk test to use higher extension version." into tm-qpr-dev am: 06367a1f18 -s ours am: 29cc7375c3 -s ours
am skip reason: Merged-In I5fb3ceed2b6db3dd5a5154df941918b97cb52204 with SHA-1 587492489c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22928624
Change-Id: I6cfc633d5b1088c584c6540cfa5e39caff8c0a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: