Merge "Migrate more of the FrameworksCoreTests to specify options in...

Merge "Migrate more of the FrameworksCoreTests to specify options in Android.bp" into main am: 0c4c1915 am: 7ac32853

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



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