DO NOT MERGE Revert "fix Screen off HCE Payment (Emulator) Screen off HCE Payment (Emulator) crash"

This reverts commit 2c07631be37a40310125c066840fe32cf40f45e9.

Reason for revert: this fix should use "DO NOT MERGE" in commit subject to prevent it from going across an API boundary level, which caused multiple merge conflicts

Bug: b/236779920

Change-Id: I51dcf2bb90c1bbfd1303354b5773d62593e57a38
1 file changed