Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister softap callback check" am: d86e0cb12f am: c0921ef27e

Change-Id: Ia3c98081592395f387a1eef1bdcfd70449d91a5a
tree: fbf57a975ff50e25ea86d4f6c60a354fe7a148a4
  1. service/
  2. PREUPLOAD.cfg