[automerger skipped] Merge "SoftApCallback using executor vs handler" am: 60bd816476 am: ff7d499b18
am: 9df1e7db67 -s ours
am skip reason: change_id I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15 with SHA1 4a18957c2d is in history

Change-Id: I8377ba18e4c06cc264799ec42fb11661d01a06d5