Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi" am: dc714602ca am: d71b50bd7d
am: 19dd4bcce8

Change-Id: Ib4ff9d666476bde1bc1d8e673abd4d23e5922484
tree: 68ee0f448a9461e2d45a05ec02b29544a5cd0242
  1. tests/