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

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I722179af885368a0bb304d55fddb1c6be4703c4a