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

This reverts commit 8564316d10bc4348185bad392158981e10dcba97.

Change-Id: Ia239de5815a9dd32df7322eb5ad591845a1c351f