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