Merge "Fix ADR half cycle state bug for AIDL HAL" into sc-dev