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: I474e9ff31e173ece1a92f1b86ac99423e45ed659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>