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

Change-Id: I31f489300cb8ec6589b78ed2a8f49c2511f25705