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 am: 3a65c1b4 am: 97e930cc
Change-Id: I63910a47c1ae63016a554edd555867360aa2d681