Merge "IOT specific changes to delay/reduce timeout for Autoconnection." into p-keystone-qcom