Fix STE_FM and QCOM_HARDWARE disputes over FM

Change-Id: I4912659b94a85e8b0a3059d18b46e56e7f0ee363