Merge "DO NOT MERGE registerSoftApCallback Executor param"
am: db46c349d8

Change-Id: I5bedf30e2fb968e0192acd6419a13d1b9ccc4d40