Merge "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: 42b6bcdb2e  -s ours am: e38a63cea3  -s ours
am: 61f3beb666  -s ours

Change-Id: Ieae4d16bae14ac79381af24ab62d60e8bbe90013