Merge "Increase the timeout for NfcHidlTargetProfilingTest." am: 6d88fc9a6a
am: 62cc546eec

Change-Id: I6cae2e1ddedcd2424739a309a6c27b08d1277a93