[automerger skipped] Merge "Add new reason code and status code for session...

[automerger skipped] Merge "Add new reason code and status code for session conflict." am: 5e289765 am: f226c321 am: b235d59a -s ours

am skip reason: Merged-In I4cbf2443d7e3ec914ee465d9128fef5225a74712 with SHA-1 fbe75bbc is already in history

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



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