Merge changes from topic "cdm-secure-channel-udc-dev" into udc-dev am: f7fd412b

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



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