Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218
am: fa968e9691

Change-Id: I0efdc1f3fd35fe059747b6ba2c6b0dc1731b3388