Merge "Update AIDL Context Hub default impl"