Merge changes from topic "stateOfHealth-public_api" into main am: ba342a4a...

Merge changes from topic "stateOfHealth-public_api" into main am: ba342a4a am: b2268436 am: 0e16096d am: 0a0c10a5 am: d856c251

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2742793



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