Merge "Migrate more of FrameworksServicesTests to use options from Android.bp" into main am: f824197c24

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

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