Merge "Add PER_DISPLAY_MAX_BRIGHTNESS VHAL property." into main