Merge "Suspend test until fixed." am: 2c540ed353 am: 4e54e4295f

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

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