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

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

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