Merge "WLAN/radio workaround for old Pixel phones"
am: 04c10eba18

Change-Id: I4bd50ce4805a13e58bae99be847434785269a5f5