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

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