Merge changes from topic "health-v3" into main am: 99a33df544

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

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