Merge "Revert^2 "Add PER_DISPLAY_MAX_BRIGHTNESS VHAL property."" into main