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

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

am skip reason: Merged-In I025df6e25a9126ec5392cd35f7b5c663efca2469 with SHA-1 3561be7d is already in history

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



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