Merge "[automerger skipped] Merge "DO NOT MERGE: Update test for devices without ring." into oreo-cts-dev am: 11ab3b7cf7  -s ours" into oreo-mr1-cts-dev am: a676d11fe0  -s ours am: 3eed55408f  -s ours am: f69de9fc12
am: ea488d44d0  -s ours

Change-Id: Ie5bb6e40563d3dd31b6ff238831bfbc3dfb26a6f