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

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

Change-Id: I9d7b5e32f2f4cfcba803590eb2581cfe2b081d62
Signed-off-by: Automerger Merge Worker <[email protected]>