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

Change-Id: I00e97d68e9faf53c85ee260fdbc31656cfa29fc2