[automerger skipped] Merge "[CDM] Add shell cmd to create a dummy transport"...

[automerger skipped] Merge "[CDM] Add shell cmd to create a dummy transport" into udc-dev am: a55fac12 am: 5a19235e -s ours

am skip reason: Merged-In I3dfc93ee450654755c268215a77feeb496669511 with SHA-1 4c959754 is already in history

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



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