Merge "DO NOT MERGE Add EffectBundleTest" into lollipop-mr1-cts-dev
am: a531363001  -s ours

Change-Id: Ib73c8a85af26fabe322eb5d2fc2693051540c47c