Merge "Allow dump modem log on user build" into udc-dev