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

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

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