Merge "Drop shell access from MediaStore_Video_MediaTest" am: 0d4cde8813

Original change: https://android-review.googlesource.com/c/platform/cts/+/1518913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd5130d2a986a5028ca90b6a5e3d91612143e159