Merge "Migrate FLAKY options from modules to test suites." into main am: 18998d2db9 am: 6049274925

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

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