[automerger skipped] Merge 10952656 am: f54f29a91c -s ours

am skip reason: Merged-In I16f3d512d7dcdde96e14eb01cd8f727317b7b363 with SHA-1 13237d6b8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/robolectric-extensions/+/25093304

Change-Id: If240e7b1c649d38797eecf6e663cd3b3302c3039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 7fd71b1fb1719029171d652a6f2e9e4f752cfa99
  1. plugins/
  2. resources/
  3. Android.bp