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

Change-Id: I37bb258baa5077c5d0ae3c7ea5dbf2f5b1854b3e