Merge "Connect main CC session with the protection flow" into udc-qpr-dev am:...

Merge "Connect main CC session with the protection flow" into udc-qpr-dev am: 34f72df7 am: 45f2889c

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



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