am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '4bc52341f1176837447826f13ca511bbcd06ae1b':
  Fix CTS case   testQueryExternalMiniThumbnails failure