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

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



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