Merge "Enable new_robolectric" into tm-dev am: f98c04b2 am: 8e111004

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



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