Merge "wifi: Add getCurrentShutdownTimeoutMills in SoftApInfo"