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

Change-Id: I0e3d90ebb299cae9268f3d49820776bb7f309991