Merge "Send AOD auth interrupt only after display state is ON" into sc-dev