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

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



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