Merge "Swap param order in registerSoftApCallback"
am: 76632c01fd

Change-Id: Id33581fd71070e23a561ca34e76f0623d66e2852