Merge "Revert "Suspend test until fixed."" am: 2e38ba51 am: 2fac1fb5 am: d5d2df7f am: 54f85e0c

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



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