Merge changes from topic "coverage-build" into main am: 6ac2c169 am:...

Merge changes from topic "coverage-build" into main am: 6ac2c169 am: 64f76a44 am: f5a35a77 am: 9e83e7a8 am: ab66142a

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



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