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

Change-Id: Id4d16a264df2865d4066632d9a5e3b0d1a2d6d5f