[automerger skipped] Merge "Potential out of bound in phNciNfc_RecvMfResp" into oc-mr1-dev am: 321c6e9efd -s ours am: cee5b02a6d -s ours

am skip reason: Merged-In I2714d022724a3caf3abe077fb9806df3b25f7142 with SHA-1 c39c851616 is already in history

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

Change-Id: I91eed453367e13323450d0b6e11e94f7dff11756