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

Change-Id: Icfb927efccdab7adda38ca71c30564a29cad785f