Merge changes from topic "apexd_host" am: c269ec35 am: 9014a6dc am:...

Merge changes from topic "apexd_host" am: c269ec35 am: 9014a6dc am: d93dead0 am: 78d97792 am: 8b36a68e

Original change: https://android-review.googlesource.com/c/platform/build/+/2639710



Change-Id: Ib600184d42e6520226c9b905e6cd63745a1153a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>