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