Merge changes I4f871e36,I1782bbb0 into nougat-cts-dev

* changes:
  DO NOT MERGE Add test for bug 62187433
  DO NOT MERGE Add EffectBundleTest