Merge "Enable new_robolectric" am: cb75f3e3f9

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

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