[automerger skipped] Merge "DO NOT MERGE registerSoftApCallback Executor param" am: db46c349d8 am: ef9a466f45 am: 3f999f34a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I4234facd9f35722f0f994db9a2b3324861ef344d