Merge "Memory leak fix in NFA_SetRfDiscoveryDuration()"
am: cb388ef835

Change-Id: I04e52b4e71aec810941be4a03cea4d18b4d0dbce