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 am: 66564d10

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



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