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

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

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