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

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

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