Merge "Clamp display brightness in AOD"