[automerger skipped] Merge "Export Wifi Parcelables AIDLs from framework.jar" am: 5ccfef6e6b am: 07ba724d11 am: 6da0f4e07e -s ours
am skip reason: Change-Id I4e0dc1119bf2b49865c9b5cdf23c571528228902 with SHA-1 6dcd768873 is in history

Change-Id: I934d99fa69db50fc398de9ae820342b430ba4824