Merge "Introduce new constants to represent PCC UID start/end range" into main-kernel