Android n-iot-release-smart-display (NIT1.180611.004)
Merge "SCO: Don't set active device if a diconnect message is defered"