Merge "Detach CDM transport upon encountering an secure channel error" into...

Merge "Detach CDM transport upon encountering an secure channel error" into udc-dev am: 79125d43 am: a06ae803 am: 44a90376 am: f5123728

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



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