Merge "[automerger skipped] Merge "DO NOT MERGE Fix android.cts.verifier.audio.RingerModeActivity fail for non-vibrate device" into oreo-mr1-cts-dev am: ee9557cd8b  -s ours" am: f86a6df7e8  -s ours am: a8e7a7b591  -s ours
am: 4e0133fe8d  -s ours

Change-Id: Ic1705f60c6d2efde3981f2ac0b04c700beb2610a