Merge "Remove Nfc hidl settings am: b1a045dcf3
am: 3876caf151" into tm-qpr-dev-plus-aosp
This commit is contained in:
b1a045dcf3
am: 3876caf151" into tm-qpr-dev-plus-aosp