[automerger skipped] Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218 am: fa968e9691
am: ed6fe63662 -s ours
am skip reason: change_id I7074278d16beac422ce7b29d4471b2794fa97825 with SHA1 cb157e8a33 is in history

Change-Id: Id22d9c37829a49c089a954bd137d50b6a0564773