[automerger skipped] Merge "Fix flaky sysui crash in devicehealthchecks test." into qt-qpr1-dev am: 72be6295c0 am: 7dcc67912b -s ours
am skip reason: Change-Id I15ef66a19eeac2c6baf652d83e6a90669834f203 with SHA-1 4197a29b68 is in history

Change-Id: I89b956552c8c69b9b4ca04b7534b1a58f643f988