[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: 2618909fe0  -s ours

Change-Id: Ie4e21e417bf8769ece3694e0c3f449be6d6de0ca