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

Change-Id: Ife4b8bd70ad64ea8568c0c7c1883b1eb16f80555