[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4e6417a203 -s ours
am: 7283d03472 -s ours
am skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history

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