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: e0a27f53 am: 8352ff44

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



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