Merge "Disable flaky unit test." am: 477f3bbb47 am: 31afdea9a4

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

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