Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309
am: f4dc128aa2

Change-Id: I52603e6bff98472c5dc6e6e5308d6beb76e7780e