Merge "Fixes for errorprone update" into main am: 7ed3b94913

Original change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3286066

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