Merge changes from topics "pdcs_builder", "refactor_pdcs",...

Merge changes from topics "pdcs_builder", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: d04f7bb4 am: 22471f0f

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

Change-Id: I3c4bf187e93caca703656e56c9ca57a17af73dce