Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev