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

Android 9.0.0 release 42

Change-Id: Ie2056f9827dc38b7411999d424dc1b961aa4bea4