tree 839129a2e7aa46ba78391547415f892eeac63134
parent 50ce022517dc0cda08fdac7ec69065109a0ade00
parent 1799a6dccda7320d3285f5e1512d2b12e3e2df27
author Calvin Pan <calvinpan@google.com> 1575958360 -0800
committer android-build-merger <android-build-merger@google.com> 1575958360 -0800

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

Change-Id: Ibfca1684e353e05c96147ced12ae1d3ef20fac4a