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

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

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