Merge "Disable flaky unit test." am: 477f3bbb am: 31afdea9 am: af17cb6c...

Merge "Disable flaky unit test." am: 477f3bbb am: 31afdea9 am: af17cb6c am: 9f5e8903 am: 1af1f937

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



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