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

Change-Id: I74c034dae770fad49fd47f0b37d32b5848357eee