Merge "configure the new key KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT to 4000ms...
Merge "configure the new key KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT to 4000ms for the UE to defer Wifi OFF until IMS is deregistered (b/142750916)" into rvc-dev am: 4431668e am: 74a01cb7
Change-Id: I8ac251d85b50d8663a54f70368be72e98765782c