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: f2129f56 am: 9c0e9492

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



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