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

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



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