Merge "Fix Download Manager Functional test and enable for APCT" into nyc-dev
am: cf4c7f58b0

* commit 'cf4c7f58b068ec1021dcd1dd7b52167ecb2247d0':
  Fix Download Manager Functional test and enable for APCT