aml_hef_341613000 (11465779,com.google.android.healthfitness)
Merge "Merge TQ1A.230205.002" am: 8c195c2f75 am: c21a164f75 am: 8b38dd09e5

Original change: https://android-review.googlesource.com/c/platform/external/expat/+/2424170

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