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 am: 922b01c2 am: 9c0ac8be

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

Change-Id: I30ce82ba107c72b69130e1b7acb17a29824af2fb