Merge "Add cuttlefish support for iccCloseLogicalChannelWithSessionInfo HAl 2.1 API" into udc-dev