[automerger skipped] Merge "Swap param order in registerSoftApCallback" am:...
[automerger skipped] Merge "Swap param order in registerSoftApCallback" am: 76632c01 am: 1f3415f3
am: c03a31c4 -s ours
am skip reason: change_id I5563c1059cc04014a0fd909e2508f7bf497d708e with SHA1 33379b36 is in history
Change-Id: I512d10b0465aee2547a7bac514a0d227403991b9