Merge "Handle non-service specific exceptions at AIDL context hub"