[automerger skipped] DO NOT MERGE: Fixed failing StepsRecordTest and DataMigrationTest tests by applying relevant changes from the main branch. am: 350ed30ece am: b0483b87fa am: 9b3e6001b6 am: 893f6e09ac am: 3138cfb3a4 -s ours

am skip reason: subject contains skip directive

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

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