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

Change-Id: Ib6c2cd2bce720180ff2365b936e07bd217a265dd