Merge changes from topic "am-5e44d23882d545a38f0ea8d1f78a13fa"

* changes:
  Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b am: 8fd59b38b7
  Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f am: caac5df325