Merge "BtAudio: Fix SessionType mapping" am: b1ab40b8d6 am: 3d22fa1d32

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

Change-Id: Icb8629524a39007480014dcbd0349a5288332723