Merge changes I3b31a5e2,I292ccafe

* changes:
  ActiveModeWarden: Remove redundant SoftApCallback
  ActiveModeWarden: Add roles for each mode manager
tree: 7e1fc379c7b4dcdc136d8050f827fb207da9c4e8
  1. service/
  2. PREUPLOAD.cfg