Merge "Enable new_robolectric" am: cb75f3e3f9 am: 3243afcfc9

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

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