Merge changes from topic "read-bootstrap-apex" into main am: 236dbc30 am:...

Merge changes from topic "read-bootstrap-apex" into main am: 236dbc30 am: 35f32500 am: 67df2ad2 am: 4a072e07

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



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