[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e0f4c66701 -s ours am: 325d68e8cc
am: ef8f99fbad

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