Merge "Revert "Suspend test until fixed."" am: 2e38ba51b8 am: 2fac1fb5b6

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

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