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

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

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