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: d342dd5f am: a030bde4 am: c744b68f

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



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