Merge "Fix data call can't be applied after Phone restart in APM on under IWLAN" into q-keystone-qcom-dev