[automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: a6c95d2405  -s ours am: 2f4730d01f am: 4d97482080
am: 460d985c92  -s ours

Change-Id: I48ac763281534e1173f273332b32431ebfaa489e