Merge "Fix Context Hub AIDL VTS CHRE version validation"