Merge tag 'android-10.0.0_r31' of https://android.googlesource.com/platform/packages/apps/Nfc into HEAD

Android 10.0.0 release 31

Change-Id: I4c81aecc149b4b4d92957648bf5789d5b5ff33be