Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9 am: cc47efa6f0

Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
tree: c36d35efb738df08a4f2ef9e1799fbba152b7b3b
  1. core/
  2. services/
  3. tests/