Merge "Adjust Context Hub AIDL based on feedback"