Merge "DO NOT MERGE Add EffectBundleTest" into oreo-cts-dev
am: 1a6ef8781b  -s ours

Change-Id: I02f6b13faae6855dd0074392b315cdf23f251dbf