[automerger skipped] Merge "Reverting the test as it might be failing other...

[automerger skipped] Merge "Reverting the test as it might be failing other tests" am: a77b0791 am: 07bf36ad am: 84610df9 -s ours

am skip reason: Merged-In I1211b8abefc99104eb9135d94d8b961a2d0a8fa0 with SHA-1 8f55b3d4 is already in history

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



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