tree 3b14b8b3e9c56cd2d7f0ccb5c3f5b9e33d701e65
parent 56712e8a76eb79863400b5bde081ae125bbe9e6c
parent ac59de4f42c5dfc72e6b84c37c4552e71b4cccc5
author Calvin Pan <calvinpan@google.com> 1575958254 -0800
committer android-build-merger <android-build-merger@google.com> 1575958254 -0800

Merge "Support carrier id in SIM_APN_URI" am: d622632bb6
am: ac59de4f42

Change-Id: I32755947581448ed193724ae56677f834e4bdb5d