Merge "Add new reason code and status code for session conflict." am: 5e289765fa am: f226c32192

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2484904

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