am 8337b0a8: am b4e202d8: am e62f2fdf: am 55afe895: Expand MediaProvider tests

* commit '8337b0a8251e98c271b3d39e530017b829f4d4d0':
  Expand MediaProvider tests