Merge changes I7c525c2d,I05b9c50c

* changes:
  wifi: Migrate to DhcpResultsParcelable
  WifiServiceImpl: Alternative to @hide FLAG_RECEIVER_INCLUDE_BACKGROUND
tree: 3e8404ca948af40ddfecef5dc4c30fba90959c51
  1. apex/
  2. service/
  3. PREUPLOAD.cfg