[automerger skipped] Merge "Marking SoftApCallback methods as SystemAPI" am: 8295ffc5af am: 179ed7d640
am: 49960bdd5f -s ours
am skip reason: change_id I22b5029a8dbd7a50ad6faf0bb3b15269af839956 with SHA1 80c86d5c08 is in history

Change-Id: I991e8991b4a82c6363f7cc45ad419725b463e6ab