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: 4431668e6b

Change-Id: I4ffad170d62867070df7685b0090ade5607da1c8