Merge "Exclude androidx.test.filters.FlakyTest in TEST_MAPPING" into udc-dev am: bc28899ee4 am: f81ceadead

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

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