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

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

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