Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 58ba0b44c2 am: 6b0c2c3cc6 am: 3249f9ff35

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

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