[automerger skipped] Move merge test to integration tests am: e8280d63cb am: fb7ec4aa2f am: 456744cf31 -s ours am: 40d8c419bf -s ours

am skip reason: Merged-In Ic15dc9563e40357de3fadac1de0c32dd4aa9ad47 with SHA-1 e8280d63cb is already in history

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

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