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

Android 9.0.0 Release 16 (PQ1A.181105.017.A1)

Change-Id: I67dc44ab4fdb287d5a01b7990fbdffef946dd769