Merge "Move ACTION_AMBIENT_DISPLAY from O to N-MR1 constant."