[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister softap callback check" am: d86e0cb12f am: c0921ef27e am: 97a8253655 -s ours
am skip reason: Change-Id I11a30c48b68dbaeffe6cb36bf94ea2b13d096f9e with SHA-1 0f0baaa758 is in history

Change-Id: I682b0429f994b384fa3355b70b7036b52b5fe7a3
tree: 2833d91d0ebd740816559267900c1c342e0b25cd
  1. apex/
  2. service/
  3. PREUPLOAD.cfg