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"