[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 am: cb361bf6 am: 95de6cdd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie87bfca8774ecb47c8d12a9c4e4c345e559ef172