Merge "Revert "[CDM Transport] Exchange platform info to decide which...

Merge "Revert "[CDM Transport] Exchange platform info to decide which Transport to"" into udc-dev am: 8186b7ed

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



Change-Id: Icb9a270ba798f7cbb9aa43410af17c7c179da747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>