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

Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: 24f4fce2 am: 61fa631c am: 5a7ce86b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438018

Change-Id: I5199796e48dc37fdeae9be98c71a3a5c40f14079