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

[automerger skipped] Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: 24f4fce2 am: 61fa631c am: 5a7ce86b am: 2bccbbd1 am: 44d5bbb0 -s ours

am skip reason: Change-Id I9445ec854709996c80830e4c8c498e664f1e4f9c with SHA-1 fe59b726 is in history

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

Change-Id: Iab731625f85e4102ef469ef636e08d1137fae7ad