Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: 24f4fce2df

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

Change-Id: Idee4834beda040953fa3e13e2718b28b47f5887d