[automerger skipped] DO NOT MERGE Revert "fix Screen off HCE Payment (Emulator) Screen off HCE Payment (Emulator) crash" am: f489d81f76 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/2133258

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