Merge "Drop shell access from MediaStore_Video_MediaTest"