Merge changes from topics "cherrypick-cmp_remove-hbzs36k4y0-sc-mainline-prod", "verify-cursor" into sc-mainline-prod

* changes:
  Verify CloudMediaProvider query cursors
  Remove unusued CloudMediaProvider API