[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 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I65b429dfc78c1ad2e0254041e97f4f727bd5f179