Merge "Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f3 am: 22765d38" into oc-dr1-dev-plus-aosp