Merge changes from topic "health-v3" into main am: 99a33df5 am: 83fe701d

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



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