Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev