Merge "HeadsUpManager: escalate via wakefulness lifecycle instead of broadcast" into oc-dr1-dev
am: 02be5d1ddd

Change-Id: Ice2cd4a549cdfd4a39c331d9d8063476ec48f518