Merge "Disable flaky unit test." am: 477f3bbb47 am: 31afdea9a4 am: af17cb6c59 am: 9f5e8903f1 am: 1af1f93720

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>