Merge "DO NOT MERGE: Update test for devices without ring." into oreo-cts-dev