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

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



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