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: 2618909fe0  -s ours am: a26c0de6ce" into pi-dev-plus-aosp