[automerger skipped] Merge "remove bearer bitmask when creating default...

[automerger skipped] Merge "remove bearer bitmask when creating default emergency apn settings" am: be781d47 am: d1512978 am: f5b52186 -s ours

am skip reason: Change-Id Iace24884a116f6e5b004e9e18a4a3c3eaeec6fe3 with SHA-1 caccbd69 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1496468

Change-Id: I825b0d7e9cd82403405f8db103f3d6eca50e279d