tree b2ae289188539d59d6f419f9876d718b010fdfc8
parent 88486e8b631759077ce26c45054ee2a80f3569b1
author Ruchi Kandoi <kandoiruchi@google.com> 1542321315 -0800
committer JP Sugarbroad <jpsugar@google.com> 1547506526 -0800

Fix CVE

Test: NFC enable/disable
Bug: 119223615
Bug: 111699773
Bug: 111660010
(cherry picked from commit 93233eb6f2a9e602c059edc20e26845384432db6)