Revert "Wi-Fi AP priorities code cleanup"

This reverts commit 83b4718c3a90729a8e2404c4d673cf6d2a00408f.

Change-Id: I0f4d0e13fc08a2fd1bfb8b72ab06d801c283dadb