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: 62d791e7 am: 5cb9a27b am: 7d0d3741
Change-Id: Ic5533f00bc0f9ea36fcdc25c3af8c05006dc32bb