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

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



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