[automerger skipped] Fix flaky test cases and OEM device failed test cases am: f5aadcaaed am: a9374d1f74 am: 9d81a18fd7 am: 4e131d4983 am: 99c866ed0e -s ours
am skip reason: Change-Id I71d934c593560a7822d6fe7523b92c227c738e22 with SHA-1 52f29268ef is in history

Change-Id: I5e2e9444a67aa8d1a9923fd216374e24e10539e0