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

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

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