Merge changes from topic "health-v3" into main am: 99a33df544 am: 83fe701de3 am: 968e404586

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

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