Merge "Merge "Send / recv contextsync messages via securechannel" into udc-dev...

Merge "Merge "Send / recv contextsync messages via securechannel" into udc-dev am: 6a6bb409 am: dfa17750" into udc-d1-dev-plus-aosp am: fd9b07f3

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



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