[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 74a971a76f  -s ours

Change-Id: Ic3caec52f7c24a21dbf7a8b2180217036234bae1
tree: 286925d1981af86a84110d7f9e8c8660e8081bf7
  1. hal/
  2. ipacm/
  3. ipanat/
  4. configure.ac
  5. Makefile.am
  6. os_pickup.bp
  7. os_pickup.mk