Merge "Remove unnecessary rules from NFC HAL clients" am: 93f99cb1d9
am: 3d12305d42

Change-Id: Id45b1a26067b7525feabb029d5c98270d0c5994b