[automerger skipped] Merge "Enable new_robolectric" into tm-dev am: f98c04b2...

[automerger skipped] Merge "Enable new_robolectric" into tm-dev am: f98c04b2 am: 8fb0faa5 -s ours

am skip reason: Merged-In I025df6e25a9126ec5392cd35f7b5c663efca2469 with SHA-1 800f9959 is already in history

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



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