Merge changes from topic "l1" into lollipop-mr1-cts-dev

* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506