Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main am:...

Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main am: deff2238 am: 2e438b3a am: 4c8b9529 am: 68c1dc5b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2685548



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