Merge "Associate the session type in operation context with the client" into...

Merge "Associate the session type in operation context with the client" into udc-dev am: acdde95a am: 9b0e9aaf am: 3a2f76dc

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



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