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

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



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