Merge tag 'android-11.0.0_r43' of https://android.googlesource.com/platform//packages/apps/Nfc into r

Android 11.0.0 release 43