[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: e0f4c66701 -s ours
am skip reason: subject contains skip directive

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