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

Change-Id: Iab45bb64e04cbddde6cd627763aab19b663aa919