Merge "[automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: a6c95d2405  -s ours" into oreo-mr1-cts-dev
am: b72935bde2  -s ours

Change-Id: I097dec23e4ee294ec2548b6ae7c1fa67f783e498