[automerger skipped] Merge "DO NOT MERGE Revert "fix Screen off HCE Payment (Emulator) Screen off HCE Payment (Emulator) crash"" into android12-tests-dev am: 859d6d524c -s ours

am skip reason: subject contains skip directive

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

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