Revert "Wi-Fi AP priorities code cleanup"

This reverts commit 8d6cf0b3dc5f07e7458c9436de21bbfac3d9bca6.

Change-Id: I52725aef9285802cc3b63c87afd94c46317eaf62