[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev-plus-aosp
am: 2c0a9bd122 -s ours
am skip reason: subject contains skip directive

Change-Id: I851e10225040566e84f35f883c764d500ad6ee2f