Merge "Get UA and UAProfUrl from Carrier Config First" am: e2e922af94 am: 877768419a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1361556

Change-Id: I7c655c04d9ddb635777d80b640b4227be66b96dd