Merge "Merge "Add LightingFilter behavior test" into nyc-dev am: 7039adafa9 am: f921dfc23d" into nyc-mr1-dev-plus-aosp