Merge "Nfc: Null ptr checks in HAL" am: 3b4d423d42
am: 0ee41f6f8c

Change-Id: Ifc05d12c32e646ceb0f2e810a23d205cdfe7cdc7