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

Change-Id: I10e9cee844367c63f74754ee451b316738f56906