[automerger skipped] Merge 10952656 am: f54f29a91c -s ours am: 369f1249d6 -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: Ib082635fefdda93e3df94e310f7f894711356304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c532eeefbe093614e446ac32bac512433c909cda
  1. plugins/
  2. resources/
  3. Android.bp