Merge "Add flag-junit to FrameworksMockingServicesTests" into main am: 2195d3d78d am: 801e834597

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

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