Bug: 150979686 Bug: 150979837 Test: atest android.net.wifi.cts.ConcurrencyTest Change-Id: Id9c18ae602be23cbcc5d9c605c27b10424e1d1d9