Merge "CP to aosp Display service needs trigger to start" into android14-gsi