Merge "remove all uses of AndroidX in telecom frameworks comments" into udc-dev