Merge "Don't reset brightness when going into AOD_PAUSED" into tm-dev