[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 93879fac99 -s ours am: 2ddefaa8ea -s ours

am skip reason: Change-Id Ifd6ed878ab1907a2e5be444cf6b7bfbfc96d3e99 with SHA-1 cc28b4329f is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1323635

Change-Id: I4070759b59eda60fcf0a0734f74c3fdea756dfe4