[automerger skipped] Merge "[RESTRICT AUTOMERGE] SF: Disable flaky unit tests"...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] SF: Disable flaky unit tests" am: e63362fa am: 6a580e5c am: 4ef5da6b -s ours am: 0021fac8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1689165

Change-Id: I31f122233fba65f37728e2ac3b62358972263be8