Wi-Fi AP priorities code cleanup

Change-Id: I8e4838f78b4f7bc80fc0dc21604337ccfeb15f50