[automerger skipped] Fix crash loop in TestAppActivity am: 33a25b921e -s ours am: 8c69828f8c -s ours

am skip reason: Merged-In I8a6b12ad785a759a9b420ebff12c275abfb68934 with SHA-1 0a0ba4adb6 is already in history

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

Change-Id: Ibbaaf107b31b6f36352c17195838a8929515197c
Signed-off-by: Automerger Merge Worker <[email protected]>