Update CVE-2019-2040 Aligh with the latest system/nfc Bug: 169640640 Test: build pass Merged-In: I4c4efb807eabfc229e07dc333556f064d5f7defb Change-Id: I4c4efb807eabfc229e07dc333556f064d5f7defb