[automerger skipped] Merge changes from topics "pdcs_builder",...

[automerger skipped] Merge changes from topics "pdcs_builder", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: d04f7bb4 am: 22471f0f am: 922b01c2 am: 9c0ac8be am: 45f25750 -s ours

am skip reason: Change-Id Idf61f7c66b8291446315ab54a18b54080a9107c0 with SHA-1 68ad414f is in history

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

Change-Id: Ifb0346659c2ff28b2d303383a6f321e80cc6be82