Revert "Revert "Wi-Fi AP priorities code cleanup""

This reverts commit 7d9c5c5d6fadc42d045c97015aca10df3afcb8d1.

Change-Id: I7c3a8fea14fb9ba5da8ffebb5c15b142419c6a24