Merge "Replace the local WifiChannelWidth enum with the new AIDL definition." into main