DO NOT MERGE Add Enterprise Wifi connection support in sl4a. b/19590352
automerge: 40a3e6e  -s ours

* commit '40a3e6e73ced31747cb87dd157df2b32834fd73d':
  DO NOT MERGE Add Enterprise Wifi connection support in sl4a. b/19590352