[automerger skipped] WifiService: Revert get/remove passpoint API deprecation am: a5cbc16c2a
am: 296b780093 -s ours
am skip reason: change_id Id073c25a021dbeb81e87064e93ead966a363390e with SHA1 8bc240f56c is in history

Change-Id: I716bc9fcbde86de90b178db818a1ce306918bc28
tree: 139a095a0fae54e5b3ed1853721cf87ee4d76603
  1. service/
  2. PREUPLOAD.cfg