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

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

Change-Id: I9a64f6562d8a91e3291e7f25060df95002a2501a