Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission"
am: c381068caa

Change-Id: I065b5403d2f89d158e76f63c9b125ad30e603633
tree: 3c403d5da2d1ae6b6b562a2dc5f66fdce988d58d
  1. core/
  2. services/
  3. tests/