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

Change-Id: I78669da1158fca8ca7276aeb0a09715d4452d737