Merge "Adapt MediaStorageTest for watches" into android13-tests-dev am: 98c957bde6 am: eef70ad719

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

Change-Id: I2a4e36e8cf6124fda4ded0e060dcb72910451243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>