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

Change-Id: I96fa7e8a6816a13409b049248db18731ae9caf27