[automerger skipped] Merge "fix Screen off HCE Payment (Emulator) Screen off HCE Payment (Emulator) crash" into android12-tests-dev am: 89d47e8781 -s ours

am skip reason: skipped by user alisher

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

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