Merge "Close VirtualDevice when CDM association is removed" into udc-dev am:...

Merge "Close VirtualDevice when CDM association is removed" into udc-dev am: 362ca09a am: 6fdddabf

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



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